Merge pull request #1 from ledgersmb/1.3

1.3 wtf, sorry, if I mess up something, first time with github

Changelog

@@ -2,6 +2,12 @@ Changelog for 1.3 Series
 Initial Release:  Monday, Oct 12 2011
 Supported Presently
 
+Changelog for 1.3.40
+* Updated nginx configuration (Pongracz I)
+* GL account search now will search within descriptions for matches (Chris T)
+* Printing without an invoice number now errors instead of increments (Chris T)
+* Fixed internal server error using cash/payment (Chris T)
+
 Changelog for 1.3.39
 * Fixed Internal Server Error clicking through ar/ap report (Chris T, 1022)
 * Fixed internal server error deleting part (Chris T, 1027)

LedgerSMB/DBObject/Payment.pm

@@ -794,6 +794,9 @@ sub post_payment {
    $self->error($self->{_locale}->text("Exchange rate inconsistency with database.  Got [_1], expected [_2]", $self->{exrate}, $db_exchangerate));
    }
  }
+ for (@{$self->{amount}}){
+    $_ = $_->bstr if ref $_;
+ }
  my @TMParray = $self->exec_method(funcname => 'payment_post');
  $self->{dbh}->commit();
  $self->{payment_id} = $TMParray[0]->{payment_post};

bin/aa.pl

@@ -186,7 +186,6 @@ sub create_links {
 
     $duedate     = $form->{duedate};
     $crdate	 = $form->{crdate};
-    $taxincluded = $form->{taxincluded};
 
     $form->{formname} = "transaction";
     $form->{format}   = "postscript" if $myconfig{printer};
@@ -218,9 +217,6 @@ sub create_links {
     $form->{currency} =~ s/ //g;
     $form->{duedate}     = $duedate     if $duedate;
     $form->{crdate}      = $crdate      if $crdate;
-    $form->{taxincluded} = $taxincluded if $form->{id};
-
-    $form->{notes} = $form->{intnotes} if !$form->{id};
 
     $form->{"old$form->{vc}"} =
       qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
@@ -378,7 +374,7 @@ sub create_links {
 
 
     # check if calculated is equal to stored
-    # taxincluded is terrible to calculate
+    # taxincluded can't be calculated
     # this works only if all taxes are checked
 
     @taxaccounts = Tax::init_taxes( $form, $form->{taxaccounts} );
@@ -505,16 +501,6 @@ sub form_header {
 </tr>
 |;
 
-    $taxincluded = "";
-    if ( $form->{taxaccounts} ) {
-        $taxincluded = qq|
-	      <tr>
-		<td align=right><input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}></td>
-		<th align=left nowrap>| . $locale->text('Tax Included') . qq|</th>
-	      </tr>
-|;
-    }
-
     if ( ( $rows = $form->numtextrows( $form->{notes}, 50 ) - 1 ) < 2 ) {
         $rows = 2;
     }
@@ -679,7 +665,6 @@ sub form_header {
 	print qq|
 	      $exchangerate
 	      $department
-	      $taxincluded
 	    </table>
 	  </td>
 	  <td align=right>

bin/io.pl

@@ -1635,14 +1635,10 @@ sub print_form {
     $form->isblank( "${inv}date",
         $locale->text( $form->{label} . ' Date missing!' ) );
 
-    # get next number
-    if ( !$form->{"${inv}number"} ) {
-        $form->{"${inv}number"} =
-          $form->update_defaults( \%myconfig, $numberfld );
-        if ( $form->{media} eq 'screen' ) {
-            &update;
-            $form->finalize_request();
-        }
+    # We used to increment the number but we no longer allow printing before
+    # posting, so the safe thing to do is just to display an error.  --Chris T
+    if ( !$form->{"${inv}number"} and $inv) {
+        $form->error($locale->text('Reference Number Missing'));
     }
 
     # $locale->text('Invoice Number missing!')

locale/po/es_AR.po

@@ -2497,9 +2497,6 @@ msgstr "Listar Departamentos"
 msgid "List Businesses"
 msgstr "Listar Negocios"
 
-msgid "Add Language"
-msgstr "Agregar Idioma"
-
 msgid "List Languages"
 msgstr "Listar Idioma"