Laurent Destailleur
|
15da97f1da
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/compta/facture/card.php
htdocs/product/price.php
|
2021-08-24 15:05:14 +02:00 |
|
Laurent Destailleur
|
591059847e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/product/price.php
|
2021-08-24 15:00:35 +02:00 |
|
Christian Foellmann
|
d706c3b1ec
|
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
|
2021-08-20 14:41:30 +02:00 |
|
stickler-ci
|
b92fe38bc0
|
Fixing style errors.
|
2021-08-16 01:47:49 +00:00 |
|
henrynopo
|
9a65cbeab7
|
Customer Invoice - Multicurrency Remaining to Pay
Added the remainder to be paid in multicurrency mode.
|
2021-08-16 09:39:09 +08:00 |
|
Marc de Lima Lucio
|
08f21e3fc4
|
FIX: invoice validation: when checking if any vat rate has a negative amount, prevent false positives with -1E-14 amounts
|
2021-08-10 10:23:56 +02:00 |
|
jpb
|
f99ba2c1e1
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
|
2021-08-04 17:26:23 +02:00 |
|
Marc de Lima Lucio
|
9d234a8541
|
FIX: multicurrency: fields in discount unitialized when creating deposit
|
2021-08-03 18:32:22 +02:00 |
|
Laurent Destailleur
|
eced1c824a
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/class/html.form.class.php
htdocs/projet/tasks/time.php
|
2021-08-02 18:47:09 +02:00 |
|
Laurent Destailleur
|
d822421e10
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/accountancy/tpl/export_journal.tpl.php
htdocs/projet/tasks/time.php
|
2021-08-02 18:31:26 +02:00 |
|
Alexandre SPANGARO
|
262dd1600b
|
FIX: Invoice - Missing button to reopen an abandoned situation invoice
|
2021-07-29 06:23:12 +02:00 |
|
stickler-ci
|
2f0ba41a53
|
Fixing style errors.
|
2021-07-20 13:35:10 +00:00 |
|
jpb
|
1237c5ba55
|
add msg to formconfirm on propal invoice and commande
|
2021-07-20 14:46:56 +02:00 |
|
Laurent Destailleur
|
7013f01a41
|
Fix look and feel v14
|
2021-07-04 21:14:46 +02:00 |
|
Laurent Destailleur
|
f6efe51032
|
Fix trouble with product id = -1
|
2021-07-04 21:02:02 +02:00 |
|
Laurent Destailleur
|
6ae1d192e4
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/card.php
|
2021-07-02 16:14:12 +02:00 |
|
Laurent Destailleur
|
01cf608ef4
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-07-02 16:06:48 +02:00 |
|
Laurent Destailleur
|
a7f850dafb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-07-02 16:05:51 +02:00 |
|
Laurent Destailleur
|
7c2121c439
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/tpl/objectline_edit.tpl.php
|
2021-06-30 15:06:16 +02:00 |
|
Laurent Destailleur
|
51456741d9
|
FIX Can't edit replacement invoice
FIX Status of invoice when making a replacement invoice
|
2021-06-30 12:43:44 +02:00 |
|
atm-arnaud
|
8772c53723
|
FIX deposit can create credit note in payment conf
|
2021-06-30 12:37:21 +02:00 |
|
Laurent Destailleur
|
56787bc292
|
Update card.php
|
2021-06-29 19:14:03 +02:00 |
|
Francis Appels
|
1b7b45d72a
|
Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2
|
2021-06-29 16:56:48 +02:00 |
|
Francis Appels
|
e4f61d430f
|
Invoice php 8 issue and warnings.
Seems if ("" < 0) is true in php 8
|
2021-06-29 16:33:24 +02:00 |
|
lmarcouiller
|
923a015aac
|
Fix #18014 : update of compta/facture/card.php
|
2021-06-28 11:38:34 +02:00 |
|
Laurent Destailleur
|
67e7556f70
|
Merge pull request #18032 from OPEN-DSI/new-invoice-create-from-clone-errors
NEW get errors on create invoice from clone
|
2021-06-26 11:53:45 +02:00 |
|
Laurent Destailleur
|
6e3647af2c
|
Debug v14
|
2021-06-26 00:08:19 +02:00 |
|
lvessiller
|
24acc82ca6
|
NEW get errors on create invoice from clone
|
2021-06-25 16:40:39 +02:00 |
|
Laurent Destailleur
|
756786f717
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
|
2021-06-11 19:05:05 +02:00 |
|
Frédéric FRANCE
|
0ea0966b09
|
Update card.php
|
2021-06-08 12:01:05 +02:00 |
|
Frédéric FRANCE
|
b1c3a7cf48
|
avoid fatal error
|
2021-06-08 10:38:34 +02:00 |
|
Laurent Destailleur
|
8b5922a0df
|
Update card.php
|
2021-06-04 12:57:43 +02:00 |
|
Laurent Destailleur
|
43be7cf996
|
Update card.php
|
2021-06-04 12:56:40 +02:00 |
|
Laurent Destailleur
|
292d5f6a15
|
Update card.php
|
2021-06-04 12:55:03 +02:00 |
|
stickler-ci
|
dfb2e54750
|
Fixing style errors.
|
2021-05-27 14:25:42 +00:00 |
|
Frans Bosman
|
fd2d10d443
|
Update card.php
|
2021-05-27 16:23:33 +02:00 |
|
stickler-ci
|
c31530e7ed
|
Fixing style errors.
|
2021-05-27 10:24:18 +00:00 |
|
Frans Bosman
|
61753791b4
|
Update card.php
Add Batchinfo on invoice detail lines if hidden feature INCUDE_BATCHINFO_ON_INVOICE is set
|
2021-05-27 12:20:42 +02:00 |
|
Laurent Destailleur
|
dbd7292cd6
|
Replace doubleval into floatval
|
2021-05-20 09:22:55 +02:00 |
|
Laurent Destailleur
|
217ee260c2
|
css
|
2021-05-19 15:11:47 +02:00 |
|
Laurent Destailleur
|
cf0da5cee7
|
css
|
2021-05-19 15:00:44 +02:00 |
|
stickler-ci
|
05ea8761a1
|
Fixing style errors.
|
2021-05-13 08:28:14 +00:00 |
|
ptibogxiv
|
b9336570ff
|
NEW report contact/adresses on credit note from invoice
keep same contact/adresses from source invoice (ir: usefull for correct notifications)
|
2021-05-13 10:26:09 +02:00 |
|
Laurent Destailleur
|
b5a43c8d1d
|
FIX #17502
|
2021-05-11 21:31:43 +02:00 |
|
Laurent Destailleur
|
d1f11d2e65
|
Merge pull request #17429 from fr69400/develop
FIX formAddObjectLine cant be overloaded by hook
|
2021-05-03 13:16:45 +02:00 |
|
fr69400
|
96baa1ef49
|
wrong variable name
|
2021-04-29 17:36:45 +02:00 |
|
fr69400
|
d9e25c61bb
|
formAddObjectLine cant be overloaded by hook
|
2021-04-29 15:32:15 +02:00 |
|
Laurent Destailleur
|
efbed70286
|
Update card.php
|
2021-04-27 01:17:26 +02:00 |
|
stickler-ci
|
6387b929cc
|
Fixing style errors.
|
2021-04-26 12:30:44 +00:00 |
|
Robin-Yann
|
9fc0416664
|
Update card.php
|
2021-04-26 14:28:43 +02:00 |
|
Robin-Yann
|
c1f3626cd7
|
Update card.php
|
2021-04-26 14:11:24 +02:00 |
|
Robin-Yann
|
676067eafc
|
Update card.php
|
2021-04-26 10:21:25 +02:00 |
|
stickler-ci
|
ebd3b00016
|
Fixing style errors.
|
2021-04-26 07:24:00 +00:00 |
|
Robin-Yann
|
836b811449
|
Merge branch 'develop' into 13-fix-combo-prospect
|
2021-04-26 09:21:32 +02:00 |
|
Laurent Destailleur
|
fd2d317b4a
|
Fix #yogosha5881
|
2021-04-25 15:55:36 +02:00 |
|
Laurent Destailleur
|
6c2d9d3b3c
|
Fix permission to reopen invoice.
|
2021-04-25 13:17:47 +02:00 |
|
Laurent Destailleur
|
48c26fd614
|
Fix add option INVOICE_DISALLOW_REOPEN to lock problematic feature
|
2021-04-24 18:43:24 +02:00 |
|
Laurent Destailleur
|
db5dcd3e52
|
NEW When a doc file is shared, link is visible from main page of doc.
|
2021-04-15 17:56:55 +02:00 |
|
Laurent Destailleur
|
f1d55d38ba
|
Show link to shared file if it exists.
|
2021-04-15 17:09:15 +02:00 |
|
Laurent Destailleur
|
fcc6431896
|
Merge pull request #17136 from aspangaro/14a35
NEW: Add deposit on supplier invoice (& somes ajustments)
|
2021-04-07 02:51:32 +02:00 |
|
Laurent Destailleur
|
e23ddb383e
|
css
|
2021-04-06 23:38:52 +02:00 |
|
Laurent Destailleur
|
7c27ab6121
|
Fix css
|
2021-04-06 23:35:30 +02:00 |
|
Alexandre SPANGARO
|
82b652df8a
|
NEW: Add deposit on supplier invoice (& somes ajustments)
|
2021-04-06 09:15:34 +02:00 |
|
Laurent Destailleur
|
3744bc6a7a
|
FIX #yogosha5746 - next step (work in progress)
|
2021-03-30 18:17:13 +02:00 |
|
Laurent Destailleur
|
6e422d26f3
|
FIX #yogosha5746 - next step (wip)
|
2021-03-30 16:20:18 +02:00 |
|
Laurent Destailleur
|
5c2ee240b2
|
FIX #yogosha5752
|
2021-03-29 15:59:37 +02:00 |
|
Laurent Destailleur
|
ce1f8289a4
|
FIX #yogosha5746
|
2021-03-29 15:07:23 +02:00 |
|
Laurent Destailleur
|
b929641fe1
|
Look and feel v14
|
2021-03-29 13:00:17 +02:00 |
|
Laurent Destailleur
|
6a0e0f4c06
|
Fix #ygosha5698
|
2021-03-22 12:10:51 +01:00 |
|
UT from dolibit
|
b4e929e57f
|
Update card.php
$helpurl -> $help_url
|
2021-03-19 09:36:49 +01:00 |
|
Laurent Destailleur
|
461d748f97
|
Fix #yogosha235
|
2021-03-18 20:27:36 +01:00 |
|
Alexandre SPANGARO
|
4fd24c6855
|
Translation "Generated documents"
|
2021-03-16 04:04:18 +01:00 |
|
Laurent Destailleur
|
f11a85a3e3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
|
2021-03-03 11:37:34 +01:00 |
|
Laurent Destailleur
|
7eb3e324c7
|
FIX #16503
|
2021-03-02 23:09:55 +01:00 |
|
Laurent Destailleur
|
42329b10c9
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
|
2021-03-02 15:27:20 +01:00 |
|
Laurent Destailleur
|
cffea1889f
|
FIX #16325
|
2021-03-02 01:17:28 +01:00 |
|
Frédéric FRANCE
|
a4e25359e7
|
add missing rule
|
2021-03-01 20:37:16 +01:00 |
|
Laurent Destailleur
|
886cbc61c8
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/card.php
htdocs/core/boxes/box_factures_fourn.php
htdocs/core/boxes/box_factures_fourn_imp.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/boxes/box_members.php
htdocs/core/boxes/box_propales.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
|
2021-02-28 13:37:45 +01:00 |
|
Laurent Destailleur
|
2ce76133f4
|
FIX #16487
|
2021-02-28 12:59:58 +01:00 |
|
Laurent Destailleur
|
ccffa7e2a0
|
Merge pull request #16412 from frederic34/compta_codesyntax
code syntax compta directory
|
2021-02-26 10:21:22 +01:00 |
|
Laurent Destailleur
|
d4a78bf7c6
|
Removed useless field
|
2021-02-24 10:24:54 +01:00 |
|
Frédéric FRANCE
|
61600a9e65
|
code syntax compta directory
|
2021-02-23 21:09:01 +01:00 |
|
Laurent Destailleur
|
2642e1d1b3
|
Code syntax
|
2021-02-23 15:35:16 +01:00 |
|
Laurent Destailleur
|
888c072af0
|
NEW Can set a percentage when creating an invoice from another object
|
2021-02-23 14:48:54 +01:00 |
|
Laurent Destailleur
|
8c1902be1b
|
Missing space
|
2021-02-22 18:40:15 +01:00 |
|
Laurent Destailleur
|
71f537e4c1
|
Responsive
|
2021-02-19 22:12:03 +01:00 |
|
Laurent Destailleur
|
bfe71e8509
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-17 14:28:19 +01:00 |
|
Laurent Destailleur
|
96a213ced7
|
Fix escaping html
|
2021-02-17 11:54:34 +01:00 |
|
Laurent Destailleur
|
89bda722bf
|
Merge pull request #16232 from frederic34/paymentvat
use camelCaps name
|
2021-02-09 13:29:40 +01:00 |
|
Frédéric FRANCE
|
e2d2048522
|
deprecate non camelCaps functions
|
2021-02-09 13:25:55 +01:00 |
|
Frédéric FRANCE
|
04c25a01af
|
deprecate non camelCaps functions
|
2021-02-09 13:10:11 +01:00 |
|
Frédéric FRANCE
|
f394e55ade
|
deprecate non camelCaps functions
|
2021-02-09 10:26:17 +01:00 |
|
Frédéric FRANCE
|
6d961a1f79
|
deprecate non camelCaps functions
|
2021-02-09 09:40:07 +01:00 |
|
Frédéric FRANCE
|
815f3602e3
|
clean deprecated modelpdf to model_pdf
|
2021-02-08 18:30:09 +01:00 |
|
Laurent Destailleur
|
445e7a1e0c
|
Clean code
|
2021-02-04 10:58:07 +01:00 |
|
Laurent Destailleur
|
b349290cd1
|
Fix test for date in future
|
2021-01-31 12:57:54 +01:00 |
|
Laurent Destailleur
|
7887d4cc8e
|
Fix price2num on all GETPOST('remise_percent')
|
2021-01-31 12:48:40 +01:00 |
|
Laurent Destailleur
|
828f1c8314
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
|
2021-01-15 14:04:22 +01:00 |
|
Laurent Destailleur
|
cac7fdd058
|
Look and feel v13
|
2021-01-15 14:02:18 +01:00 |
|
Laurent Destailleur
|
e5126885fb
|
Fix css
|
2021-01-15 13:27:45 +01:00 |
|
Laurent Destailleur
|
3e85aec9a5
|
Fix url
|
2021-01-15 13:24:37 +01:00 |
|
Laurent Destailleur
|
d7a776ad8a
|
Fix url
|
2021-01-15 13:23:59 +01:00 |
|
Laurent Destailleur
|
e2598f5af3
|
NEW Add check to avoid invoice date in future
|
2021-01-11 15:34:25 +01:00 |
|
Laurent Destailleur
|
0c34543145
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-11 15:20:15 +01:00 |
|
Laurent Destailleur
|
d859072202
|
Fix GETPOST
|
2021-01-11 15:19:47 +01:00 |
|
Laurent Destailleur
|
4a919a8c6a
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-11 15:16:33 +01:00 |
|
Laurent Destailleur
|
25a703526e
|
Fix GETPOST
|
2021-01-11 15:16:01 +01:00 |
|
Florian HENRY
|
dfaf77b03f
|
merge develop
|
2021-01-03 15:14:34 +01:00 |
|
Laurent Destailleur
|
020caf8809
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-30 23:52:36 +01:00 |
|
Laurent Destailleur
|
60d1b08f84
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/takepos/invoice.php
|
2020-12-30 22:58:40 +01:00 |
|
Laurent Destailleur
|
65edc377c3
|
FIX Visible date of payment
|
2020-12-30 22:53:21 +01:00 |
|
Laurent Destailleur
|
a6eb14f68b
|
Merge pull request #15585 from cfoellmann/fckeditor-notes
NEW Can toggle FCKeditor on public/private notes
|
2020-12-27 15:06:35 +01:00 |
|
Laurent Destailleur
|
3b8947dadd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
|
2020-12-17 21:50:05 +01:00 |
|
atm-lena
|
cb2c1f3ece
|
FIX Facture Situation Out : status condition
|
2020-12-16 10:54:32 +01:00 |
|
Frédéric FRANCE
|
d1204e5e9b
|
typo ortho
|
2020-12-05 15:35:52 +01:00 |
|
Laurent Destailleur
|
9e18997e64
|
FIX #15595
|
2020-12-02 16:35:43 +01:00 |
|
Christian Foellmann
|
f801dd7d66
|
PR toggle FCKeditor on public/private notes
|
2020-11-30 16:39:14 +01:00 |
|
Laurent Destailleur
|
958893228a
|
Fix combo to add contact and status of contact on popup
|
2020-11-30 15:18:58 +01:00 |
|
Laurent Destailleur
|
00ad6df395
|
Fight against $_POST
|
2020-11-30 14:47:07 +01:00 |
|
Laurent Destailleur
|
6c65ebef0d
|
Look and feel v13
|
2020-11-29 15:16:53 +01:00 |
|
Laurent Destailleur
|
85a6a296c8
|
Fix links
|
2020-11-28 19:13:17 +01:00 |
|
Laurent Destailleur
|
81566289cd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
|
2020-11-24 11:07:35 +01:00 |
|
Laurent Destailleur
|
890f7a0602
|
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to
FIX Dol print error : conf usage thirdparty propagate extrafields to
|
2020-11-23 21:43:03 +01:00 |
|
ATM john
|
fbc911aea1
|
Fix conf usage thirdparty propagate extrafields to
|
2020-11-23 16:40:31 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Florian HENRY
|
46326d7659
|
merge from develop
|
2020-11-19 13:53:34 +01:00 |
|
Laurent Destailleur
|
47b3b30aaa
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
|
2020-11-10 11:10:35 +01:00 |
|
Florian Mortgat
|
bf27c56fa7
|
Following PR#15336: it should not be possible to modify the third party of an invoice
|
2020-11-09 17:09:06 +01:00 |
|
Laurent Destailleur
|
9e967a578e
|
FIX #14985 - I vertion option RELOAD_PAGE_ON_CUSTOMER_CHANGE
|
2020-11-03 02:17:51 +01:00 |
|
Laurent Destailleur
|
e0ed89c514
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
|
2020-11-01 17:58:41 +01:00 |
|
Laurent Destailleur
|
72160deef7
|
FIX #14979
|
2020-11-01 17:01:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Florian HENRY
|
d77a0b40a8
|
tested and approuve feaure #15036
|
2020-10-28 16:37:41 +01:00 |
|
Florian HENRY
|
a3073be8e4
|
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
|
2020-10-28 08:52:29 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Florian HENRY
|
8c935661ee
|
Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product
|
2020-10-26 10:29:35 +01:00 |
|
Laurent Destailleur
|
2638d4596a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
|
2020-10-25 21:33:13 +01:00 |
|
Laurent Destailleur
|
6bc0630c5f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/boxes/box_services_contracts.php
|
2020-10-25 21:09:43 +01:00 |
|
Florian HENRY
|
7c2b5b614f
|
NEW: preload product description on selection for customer propal/order/invoice
|
2020-10-25 19:13:09 +01:00 |
|
Maxime Kohlhaas
|
309691f1e7
|
Fix #15143 selected lines on invoice creation
|
2020-10-25 09:28:41 +01:00 |
|
Laurent Destailleur
|
3bab0a322d
|
Merge pull request #15110 from frederic34/dol_fiche_head
replace deprecated
|
2020-10-23 04:03:46 +02:00 |
|
Laurent Destailleur
|
254da6923b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/line.php
|
2020-10-23 04:00:45 +02:00 |
|
Laurent Destailleur
|
0e25843baa
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
|
2020-10-23 03:59:11 +02:00 |
|
Laurent Destailleur
|
62420c5e7b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/fourn/facture/card.php
|
2020-10-23 03:51:22 +02:00 |
|
Laurent Destailleur
|
d9aa83e699
|
Fix phpcs
|
2020-10-23 03:41:26 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent Destailleur
|
b4581b6af8
|
Better error management
|
2020-10-22 18:39:45 +02:00 |
|
Marc de Lima Lucio
|
594d9e321e
|
FIX: invoice payment terms edition: error management
|
2020-10-22 18:28:27 +02:00 |
|
Laurent Destailleur
|
0616b9bc9b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/line.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/functions2.lib.php
htdocs/core/tpl/card_presend.tpl.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2020-10-22 17:55:38 +02:00 |
|
John Botella
|
70790009a9
|
Fix display warranty fields on page load
|
2020-10-21 14:49:51 +02:00 |
|